* font.c (Ffont_shape_gstring): Don't assume glyph len fits in 'int'.

diff --git a/src/ChangeLog b/src/ChangeLog
index e26837959340818492ec7dadc71313d80c8c5c59..360027cfa4de5b428d18ab523b521bfce253eeb5 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2011-06-18  Paul Eggert  <eggert@cs.ucla.edu>
 
+       * font.c (Ffont_shape_gstring): Don't assume glyph len fits in 'int'.
+
        * fns.c (Ffillarray): Don't assume bool vector size fits in 'int'.
        Use much-faster test for byte-length change.
        Don't assume string byte-length fits in 'int'.

diff --git a/src/font.c b/src/font.c
index ecb61ab6a53b0651045320996de99aa5d0b2e88b..4619ed689131be6ea5fb89a6dcc1a25001cdfad5 100644 (file)
--- a/src/font.c
+++ b/src/font.c
@@ -4294,7 +4294,7 @@ created glyph-string.  Otherwise, the value is nil.  */)
 {
   struct font *font;
   Lisp_Object font_object, n, glyph;
-  int i, j, from, to;
+  EMACS_INT i, j, from, to;
 
   if (! composition_gstring_p (gstring))
     signal_error ("Invalid glyph-string: ", gstring);